Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Sep 2011 18:27:41 +0000 (11:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Sep 2011 18:27:41 +0000 (11:27 -0700)
commit02c8e0398ad7719b4d50e89b8c6719cbdf7207ec
tree043d8f11d2703a28cade24da90e3dc1714dda366
parent06bf1b94b12c5a2e3f53211c1c9f4a9d4a40291e
parentebc7513290c74129a32ff1c8ba1c96fc601dd753
Merge from trunk.